From c45f394d378586160936caf7dbcb6c1056944f31 Mon Sep 17 00:00:00 2001 From: Anders Hellerud Date: Fri, 5 Apr 2024 13:22:29 +0200 Subject: [PATCH 01/20] installed compendensies --- package-lock.json | 245 ++++++++++++++++++++++++++++++++++++++++++++++ package.json | 6 +- 2 files changed, 250 insertions(+), 1 deletion(-) create mode 100644 package-lock.json diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 000000000..5b94d6ae4 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,245 @@ +{ + "name": "css-frameworks-ca", + "version": "0.0.1", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "css-frameworks-ca", + "version": "0.0.1", + "license": "ISC", + "dependencies": { + "bootstrap": "^5.3.3", + "sass": "^1.74.1" + } + }, + "node_modules/@popperjs/core": { + "version": "2.11.8", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz", + "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==", + "peer": true, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/popperjs" + } + }, + "node_modules/anymatch": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", + "dependencies": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/binary-extensions": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", + "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/bootstrap": { + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.3.tgz", + "integrity": "sha512-8HLCdWgyoMguSO9o+aH+iuZ+aht+mzW0u3HIMzVu7Srrpv7EBBxTnrFlSCskwdY1+EOFQSm7uMJhNQHkdPcmjg==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/twbs" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/bootstrap" + } + ], + "peerDependencies": { + "@popperjs/core": "^2.11.8" + } + }, + "node_modules/braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dependencies": { + "fill-range": "^7.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/chokidar": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", + "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", + "dependencies": { + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + }, + "engines": { + "node": ">= 8.10.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" + } + }, + "node_modules/fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/fsevents": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, + "node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/immutable": { + "version": "4.3.5", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.5.tgz", + "integrity": "sha512-8eabxkth9gZatlwl5TBuJnCsoTADlL6ftEr7A4qgdaTsPyreilDSnUk57SO+jfKcNtxPa22U5KK6DSeAYhpBJw==" + }, + "node_modules/is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "dependencies": { + "binary-extensions": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/readdirp": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "dependencies": { + "picomatch": "^2.2.1" + }, + "engines": { + "node": ">=8.10.0" + } + }, + "node_modules/sass": { + "version": "1.74.1", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.74.1.tgz", + "integrity": "sha512-w0Z9p/rWZWelb88ISOLyvqTWGmtmu2QJICqDBGyNnfG4OUnPX9BBjjYIXUpXCMOOg5MQWNpqzt876la1fsTvUA==", + "dependencies": { + "chokidar": ">=3.0.0 <4.0.0", + "immutable": "^4.0.0", + "source-map-js": ">=0.6.2 <2.0.0" + }, + "bin": { + "sass": "sass.js" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/source-map-js": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz", + "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + } + } +} diff --git a/package.json b/package.json index 4086f0f7b..25880b462 100644 --- a/package.json +++ b/package.json @@ -22,5 +22,9 @@ "bugs": { "url": "https://github.com/NoroffFEU/css-frameworks-ca/issues" }, - "homepage": "https://github.com/NoroffFEU/css-frameworks-ca#readme" + "homepage": "https://github.com/NoroffFEU/css-frameworks-ca#readme", + "dependencies": { + "bootstrap": "^5.3.3", + "sass": "^1.74.1" + } } From b844bd6861049303ba470172d4f4db485228429f Mon Sep 17 00:00:00 2001 From: Anders Hellerud Date: Sun, 14 Apr 2024 19:46:37 +0200 Subject: [PATCH 02/20] added html filers and fixed css setup --- feed.html | 11 +++++++++++ index.html | 11 +++++++++++ package.json | 3 ++- profile.html | 11 +++++++++++ public/css/main.css | 1 + public/css/main.css.map | 1 + src/scss/{index.scss => main.scss} | 0 7 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 feed.html create mode 100644 index.html create mode 100644 profile.html create mode 100644 public/css/main.css create mode 100644 public/css/main.css.map rename src/scss/{index.scss => main.scss} (100%) diff --git a/feed.html b/feed.html new file mode 100644 index 000000000..d01f779ff --- /dev/null +++ b/feed.html @@ -0,0 +1,11 @@ + + + + + + Document + + + + + \ No newline at end of file diff --git a/index.html b/index.html new file mode 100644 index 000000000..d01f779ff --- /dev/null +++ b/index.html @@ -0,0 +1,11 @@ + + + + + + Document + + + + + \ No newline at end of file diff --git a/package.json b/package.json index 25880b462..17c50dea8 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,8 @@ "version": "0.0.1", "description": "A starting point for the CSS Frameworks CA project", "scripts": { - "test": "echo \"We will learn more about testing in the Workflow course\" && exit 1" + "test": "echo \"We will learn more about testing in the Workflow course\" && exit 1", + "build": "sass src/scss/main.scss:public/css/main.css --style compressed --watch" }, "repository": { "type": "git", diff --git a/profile.html b/profile.html new file mode 100644 index 000000000..d01f779ff --- /dev/null +++ b/profile.html @@ -0,0 +1,11 @@ + + + + + + Document + + + + + \ No newline at end of file diff --git a/public/css/main.css b/public/css/main.css new file mode 100644 index 000000000..69ec55731 --- /dev/null +++ b/public/css/main.css @@ -0,0 +1 @@ +/*# sourceMappingURL=main.css.map */ diff --git a/public/css/main.css.map b/public/css/main.css.map new file mode 100644 index 000000000..241a135de --- /dev/null +++ b/public/css/main.css.map @@ -0,0 +1 @@ +{"version":3,"sourceRoot":"","sources":[],"names":[],"mappings":"","file":"main.css"} \ No newline at end of file diff --git a/src/scss/index.scss b/src/scss/main.scss similarity index 100% rename from src/scss/index.scss rename to src/scss/main.scss From a3742013bab6357827383c8c5794ef17a170fa37 Mon Sep 17 00:00:00 2001 From: Anders Hellerud Date: Sun, 14 Apr 2024 20:21:58 +0200 Subject: [PATCH 03/20] added simple login page --- src/feed.html | 11 +++++++++++ src/index.html | 41 +++++++++++++++++++++++++++++++++++++++++ src/profile.html | 11 +++++++++++ src/scss/fonts.scss | 1 + src/scss/main.scss | 4 +++- 5 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 src/feed.html create mode 100644 src/index.html create mode 100644 src/profile.html create mode 100644 src/scss/fonts.scss diff --git a/src/feed.html b/src/feed.html new file mode 100644 index 000000000..d01f779ff --- /dev/null +++ b/src/feed.html @@ -0,0 +1,11 @@ + + + + + + Document + + + + + \ No newline at end of file diff --git a/src/index.html b/src/index.html new file mode 100644 index 000000000..0cdfeaaa6 --- /dev/null +++ b/src/index.html @@ -0,0 +1,41 @@ + + + + + + + + + CSS Course Assignment + + +
+

CSS framework CA, Socal Media Page

+
+
+
+
+
+
+

Log in

+
+
+
+
+ + +
+
+ + +
+ + +
+
+
+
+
+
+ + \ No newline at end of file diff --git a/src/profile.html b/src/profile.html new file mode 100644 index 000000000..d01f779ff --- /dev/null +++ b/src/profile.html @@ -0,0 +1,11 @@ + + + + + + Document + + + + + \ No newline at end of file diff --git a/src/scss/fonts.scss b/src/scss/fonts.scss new file mode 100644 index 000000000..a7b106b85 --- /dev/null +++ b/src/scss/fonts.scss @@ -0,0 +1 @@ +@import url('https://fonts.googleapis.com/css2?family=Roboto&display=swap'); \ No newline at end of file diff --git a/src/scss/main.scss b/src/scss/main.scss index 8b1378917..1972bba1d 100644 --- a/src/scss/main.scss +++ b/src/scss/main.scss @@ -1 +1,3 @@ - +body { + background-color: #fff; +} From ea579b2bab6aa5901ee83aabda800f266e4a6d44 Mon Sep 17 00:00:00 2001 From: Anders Hellerud Date: Sun, 5 May 2024 20:49:34 +0200 Subject: [PATCH 04/20] added a lot of work without commiting or pushing --- media/avatar.jpg | Bin 0 -> 8663 bytes package.json | 1 + public/css/main.css | 2 +- public/css/main.css.map | 2 +- src/feed.html | 68 +++++++++++++++++++++++++++++++++++++--- src/index.html | 53 ++++++++++++++++--------------- src/profile.html | 53 +++++++++++++++++++++++++++---- 7 files changed, 140 insertions(+), 39 deletions(-) create mode 100644 media/avatar.jpg diff --git a/media/avatar.jpg b/media/avatar.jpg new file mode 100644 index 0000000000000000000000000000000000000000..d7ff00d07c4412f0de8420acf70cb62d116ab389 GIT binary patch literal 8663 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 ST&_Q - - - - Document - + + + + + + + CSS Course Assignment + +

CSS framework CA, Social Media Page

+
+
+ + +
+
+ +
+
+
+
+
+ Tags: Cool story, Nice +
+ +
+

This is a post

+

Here goes the text, maybe an image also?

+
+
Posted: 16.08.1987
+
Reactions: 2 likes
+
+
+ + + +
+
+ + +
+
+ Geir Arne: Nice post! +
+
+ Durek: Great content! +
+
+
+
+
+
+ \ No newline at end of file diff --git a/src/index.html b/src/index.html index 0cdfeaaa6..2ca48716a 100644 --- a/src/index.html +++ b/src/index.html @@ -9,33 +9,34 @@ CSS Course Assignment -
-

CSS framework CA, Socal Media Page

-
-
-
-
-
-
-

Log in

-
-
-
-
- - -
-
- - -
- - -
-
+
+

CSS framework CA, Social Media Page

+
+
+
+
+
+
+

Enter site

+
+
+
+
+ + +
+
+ + +
+ Log in + Register + +
+
-
-
+
+
\ No newline at end of file diff --git a/src/profile.html b/src/profile.html index d01f779ff..ce42d984c 100644 --- a/src/profile.html +++ b/src/profile.html @@ -1,11 +1,52 @@ - - - - Document - + + + + + + + CSS Course Assignment + - +

My Profile

+
+
+ + +
+
+
+
+
+
+ + +
+ User Avatar + +
+
+

Name: My name

+

Email: My email@email.com

+

Age: 16

+

Gender: Yes

+

About: Here is something about me

+
+
+
+
+
\ No newline at end of file From 3a8978beafd4702a48a22814be57d731c77aa43c Mon Sep 17 00:00:00 2001 From: Anders Hellerud Date: Sun, 5 May 2024 20:51:11 +0200 Subject: [PATCH 05/20] Update README.md --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 9afc742da..1d4865976 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,4 @@ # css-frameworks-ca -Replace this text with a description of your social media project. +## git clone +## git npm install +## npm start From 5c651aa16c3b0a1e0614cd530664cc28dc9d058a Mon Sep 17 00:00:00 2001 From: Anders Hellerud Date: Sun, 5 May 2024 20:51:29 +0200 Subject: [PATCH 06/20] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 1d4865976..8c1d8c782 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # css-frameworks-ca -## git clone -## git npm install -## npm start +#### git clone +#### git npm install +#### npm start From a2c35d3a01deba4bb3db4f370177921c7ef50c4f Mon Sep 17 00:00:00 2001 From: Anders Hellerud Date: Sun, 5 May 2024 20:53:03 +0200 Subject: [PATCH 07/20] Update README.md --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 8c1d8c782..faebca0a2 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,10 @@ # css-frameworks-ca + +### This is a simple 3 page social media site built with html and bootstrap. No functionality. + +## Installation + #### git clone #### git npm install #### npm start + From 07fc161b5ca421b2445d577c43eebce37e347c6a Mon Sep 17 00:00:00 2001 From: Anders Hellerud Date: Sun, 5 May 2024 20:53:27 +0200 Subject: [PATCH 08/20] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index faebca0a2..17d650a43 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # css-frameworks-ca -### This is a simple 3 page social media site built with html and bootstrap. No functionality. +##### This is a simple 3 page social media site built with html and bootstrap. No functionality. ## Installation From ab5c80d639c5a392c23e8090c1fa39f32d1f3d6a Mon Sep 17 00:00:00 2001 From: Anders Hellerud Date: Mon, 6 May 2024 13:00:37 +0200 Subject: [PATCH 09/20] removed dist --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 5a670e940..541931a8f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ node_modules/ .DS_Store -dist/ + From 523a4fd297c4be7bb59419bb3560ebb349d2d054 Mon Sep 17 00:00:00 2001 From: Anders Hellerud Date: Mon, 6 May 2024 13:01:11 +0200 Subject: [PATCH 10/20] added minlengt 8 to password field --- index.html | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 index.html diff --git a/index.html b/index.html deleted file mode 100644 index d01f779ff..000000000 --- a/index.html +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - Document - - - - - \ No newline at end of file From cec8ccb24176ad19bf09605df994db108aa3764b Mon Sep 17 00:00:00 2001 From: Anders Hellerud Date: Mon, 6 May 2024 13:02:33 +0200 Subject: [PATCH 11/20] added minlenght 8 to password field --- src/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/index.html b/src/index.html index 2ca48716a..af6124750 100644 --- a/src/index.html +++ b/src/index.html @@ -20,14 +20,14 @@

CSS framework CA, Social Media Page

Enter site

-
+
- +
Log in Register From 299065bd3a20d7fb173a27ecf10e6d63edb206d8 Mon Sep 17 00:00:00 2001 From: Anders Hellerud Date: Mon, 6 May 2024 13:03:07 +0200 Subject: [PATCH 12/20] added buttons for add friend and message --- src/profile.html | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/profile.html b/src/profile.html index ce42d984c..b792ee864 100644 --- a/src/profile.html +++ b/src/profile.html @@ -31,9 +31,9 @@

My Profile

- + -
+
User Avatar
@@ -44,6 +44,10 @@

My Profile

Gender: Yes

About: Here is something about me

+
+ + +
From 4f90dcc47423e134206886a3497fb974ec3a96c3 Mon Sep 17 00:00:00 2001 From: Anders Hellerud Date: Sun, 19 May 2024 22:04:39 +0200 Subject: [PATCH 13/20] made alle the required changes --- public/css/main.css | 2 +- public/css/main.css.map | 2 +- src/feed.html | 9 +-- src/index.html | 4 +- src/profile.html | 119 +++++++++++++++++++++++++--------------- src/scss/main.scss | 49 +++++++++++++++++ 6 files changed, 130 insertions(+), 55 deletions(-) diff --git a/public/css/main.css b/public/css/main.css index c3f177c4d..f26682fa1 100644 --- a/public/css/main.css +++ b/public/css/main.css @@ -1 +1 @@ -body{background-color:#fff}/*# sourceMappingURL=main.css.map */ +h1{color:#6d1710}body{font-family:"Roboto",sans-serif}.container{margin-top:50px;display:flex;flex-wrap:wrap;justify-content:center}.card{border:2px solid #343a40}.card-header{background-color:#fff;border-bottom:2px solid #343a40}.card-body{background-color:#f8f9fa}form{max-width:400px;margin:0 auto;border-radius:10px}.btn-primary{background-color:#010102;border-color:#010203}.btn-primary:hover{background-color:#6d1710;border-color:#6d1710}.profile-card{max-width:90%;margin:5px auto}/*# sourceMappingURL=main.css.map */ diff --git a/public/css/main.css.map b/public/css/main.css.map index b850f8962..d04267d52 100644 --- a/public/css/main.css.map +++ b/public/css/main.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","sources":["../../src/scss/main.scss"],"names":[],"mappings":"AAAA,KACI","file":"main.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["../../src/scss/main.scss"],"names":[],"mappings":"AAIA,GACE,MALkB,QAQpB,KACE,gCAGF,WACE,gBACA,aACA,eACA,uBAGF,MACE,yBAEA,aACE,sBACA,gCAGF,WACE,yBAIJ,KACE,gBACA,cACA,mBAGF,aACE,yBACA,qBAEA,mBACE,yBACA,qBAIJ,cACE,cACA","file":"main.css"} \ No newline at end of file diff --git a/src/feed.html b/src/feed.html index eeacf8ecf..ca67a6764 100644 --- a/src/feed.html +++ b/src/feed.html @@ -5,17 +5,14 @@ - + CSS Course Assignment

CSS framework CA, Social Media Page

- -
-
@@ -45,7 +41,6 @@

This is a post

-
diff --git a/src/index.html b/src/index.html index af6124750..942cf29ba 100644 --- a/src/index.html +++ b/src/index.html @@ -5,7 +5,7 @@ - + CSS Course Assignment @@ -31,7 +31,7 @@

Enter site

Log in Register - +
diff --git a/src/profile.html b/src/profile.html index b792ee864..8ce75e242 100644 --- a/src/profile.html +++ b/src/profile.html @@ -1,56 +1,87 @@ - - - - - - - CSS Course Assignment - + + + + + + + CSS Course Assignment + -

My Profile

-
-
- - -
+

My Profile

+
+
+
-
-
-
-
- - -
- User Avatar - +
+
+
+
+
+ + +
+ User Avatar +
+
+

Username: My userame

+

Name: My name

+

Email: My email@email.com

+

Age: 16

+

Gender: Yes

+

About: Here is something about me

+
+
+
+
+ +
+
+
Post Title 1
+

Lorem ipsum dolor sit amet consectetur adipisicing elit. Tempore blanditiis necessitatibus voluptates. Enim, deleniti? Nostrum, sed ipsum rem, accusamus at iste reiciendis eligendi, pariatur quisquam numquam fugiat? Veniam, voluptatem saepe...

-
-

Name: My name

-

Email: My email@email.com

-

Age: 16

-

Gender: Yes

-

About: Here is something about me

+
+ +
+
+ +
+
+
Post Title 2
+

Lorem ipsum dolor sit amet consectetur adipisicing elit. Tempore blanditiis necessitatibus voluptates. Enim, deleniti? Nostrum, sed ipsum rem, accusamus at iste reiciendis eligendi, pariatur quisquam numquam fugiat? Veniam, voluptatem saepe...

-
- - +
+ +
+
+ +
+
+
Post Title 3
+

Lorem ipsum dolor sit amet consectetur adipisicing elit. Tempore blanditiis necessitatibus voluptates. Enim, deleniti? Nostrum, sed ipsum rem, accusamus at iste reiciendis eligendi, pariatur quisquam numquam fugiat? Veniam, voluptatem saepe...

-
+
+ +
+
+
+ + +
+
+
\ No newline at end of file diff --git a/src/scss/main.scss b/src/scss/main.scss index 1972bba1d..8717cbee7 100644 --- a/src/scss/main.scss +++ b/src/scss/main.scss @@ -1,3 +1,52 @@ +$primary-h1-colour: #6d1710; +$primary-btn-colour: black; +$profile-card-margin: 5px; + +h1 { + color: $primary-h1-colour; +} + body { + font-family: 'Roboto', sans-serif; // Using Google font Roboto +} + +.container { + margin-top: 50px; + display: flex; + flex-wrap: wrap; + justify-content: center; +} + +.card { + border: 2px solid #343a40; + + &-header { background-color: #fff; + border-bottom: 2px solid #343a40; + } + + &-body { + background-color: #f8f9fa; + } +} + +form { + max-width: 400px; + margin: 0 auto; + border-radius: 10px; +} + +.btn-primary { + background-color: #010102; + border-color: #010203; + + &:hover { + background-color: #6d1710; + border-color: #6d1710; + } } + +.profile-card { + max-width: 90%; + margin: 5px auto; +} \ No newline at end of file From dd98e9cda33524753d14af62660c56a18a5f2e14 Mon Sep 17 00:00:00 2001 From: Anders Hellerud Date: Sun, 19 May 2024 22:10:47 +0200 Subject: [PATCH 14/20] Delete feed.html --- feed.html | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 feed.html diff --git a/feed.html b/feed.html deleted file mode 100644 index d01f779ff..000000000 --- a/feed.html +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - Document - - - - - \ No newline at end of file From 9fa57c08f9aae01314783c9ea215e0b0b50019a9 Mon Sep 17 00:00:00 2001 From: Anders Hellerud Date: Sun, 19 May 2024 22:10:56 +0200 Subject: [PATCH 15/20] Delete profile.html --- profile.html | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 profile.html diff --git a/profile.html b/profile.html deleted file mode 100644 index d01f779ff..000000000 --- a/profile.html +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - Document - - - - - \ No newline at end of file From 2fbe570df379f8cb2d5591308cf3e1b09397ac5d Mon Sep 17 00:00:00 2001 From: Anders Hellerud Date: Sun, 19 May 2024 22:42:37 +0200 Subject: [PATCH 16/20] last fixes --- public/css/main.css | 2 +- public/css/main.css.map | 2 +- src/feed.html | 4 ++-- src/index.html | 50 ++++++++++++++++++++--------------------- src/profile.html | 28 ++++++++++++----------- src/scss/main.scss | 24 ++++++++++++++++---- 6 files changed, 64 insertions(+), 46 deletions(-) diff --git a/public/css/main.css b/public/css/main.css index f26682fa1..54952133f 100644 --- a/public/css/main.css +++ b/public/css/main.css @@ -1 +1 @@ -h1{color:#6d1710}body{font-family:"Roboto",sans-serif}.container{margin-top:50px;display:flex;flex-wrap:wrap;justify-content:center}.card{border:2px solid #343a40}.card-header{background-color:#fff;border-bottom:2px solid #343a40}.card-body{background-color:#f8f9fa}form{max-width:400px;margin:0 auto;border-radius:10px}.btn-primary{background-color:#010102;border-color:#010203}.btn-primary:hover{background-color:#6d1710;border-color:#6d1710}.profile-card{max-width:90%;margin:5px auto}/*# sourceMappingURL=main.css.map */ +h1{color:#6d1710}body{font-family:"Roboto",sans-serif;display:flex;justify-content:center;align-items:center;flex-direction:column}.container{margin-top:50px;display:flex;flex-wrap:wrap;justify-content:center}.card{border:2px solid #343a40}.card-header{background-color:#fff;border-bottom:2px solid #343a40}.card-body{background-color:#f8f9fa}form{max-width:90%;margin:0 auto;border-radius:10px;min-width:300px}.form-control{width:90%}.btn-primary{background-color:#010102;border-color:#010203;width:90%}.btn-primary:hover{background-color:#6d1710;border-color:#6d1710}.profile-card{max-width:90%;margin:5px auto}nav{width:100%}/*# sourceMappingURL=main.css.map */ diff --git a/public/css/main.css.map b/public/css/main.css.map index d04267d52..be338e74e 100644 --- a/public/css/main.css.map +++ b/public/css/main.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","sources":["../../src/scss/main.scss"],"names":[],"mappings":"AAIA,GACE,MALkB,QAQpB,KACE,gCAGF,WACE,gBACA,aACA,eACA,uBAGF,MACE,yBAEA,aACE,sBACA,gCAGF,WACE,yBAIJ,KACE,gBACA,cACA,mBAGF,aACE,yBACA,qBAEA,mBACE,yBACA,qBAIJ,cACE,cACA","file":"main.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["../../src/scss/main.scss"],"names":[],"mappings":"AAKA,GACE,MANkB,QASpB,KACE,gCACA,aACA,uBACA,mBACA,sBAGF,WACE,gBACA,aACA,eACA,uBAGF,MACE,yBAEA,aACE,sBACA,gCAGF,WACE,yBAIJ,KACE,cACA,cACA,mBACA,gBAIF,cACE,UAGF,aACE,yBACA,qBACA,UAEA,mBACE,yBACA,qBAIJ,cACE,cACA,gBAGF,IACE","file":"main.css"} \ No newline at end of file diff --git a/src/feed.html b/src/feed.html index ca67a6764..436160b7d 100644 --- a/src/feed.html +++ b/src/feed.html @@ -10,6 +10,7 @@

CSS framework CA, Social Media Page

+
@@ -58,7 +60,5 @@

This is a post

- - \ No newline at end of file diff --git a/src/index.html b/src/index.html index 942cf29ba..c4bc6b126 100644 --- a/src/index.html +++ b/src/index.html @@ -9,34 +9,34 @@ CSS Course Assignment -
-

CSS framework CA, Social Media Page

-
-
-
-
-
-
-

Enter site

-
-
-
-
- - -
-
- - -
- Log in - Register - -
+
+

CSS framework CA, Social Media Page

+
+
+
+
+
+

Enter site

+
+
+
+
+ + +
+
+ + +
+ Log in + Register + +
+
-
\ No newline at end of file diff --git a/src/profile.html b/src/profile.html index 8ce75e242..d80498f41 100644 --- a/src/profile.html +++ b/src/profile.html @@ -10,20 +10,22 @@

My Profile

-
-
- +
+
diff --git a/src/scss/main.scss b/src/scss/main.scss index 8717cbee7..d826602eb 100644 --- a/src/scss/main.scss +++ b/src/scss/main.scss @@ -2,12 +2,17 @@ $primary-h1-colour: #6d1710; $primary-btn-colour: black; $profile-card-margin: 5px; + h1 { color: $primary-h1-colour; } body { - font-family: 'Roboto', sans-serif; // Using Google font Roboto + font-family: 'Roboto', sans-serif; // + display: flex; + justify-content: center; + align-items: center; + flex-direction: column; } .container { @@ -31,14 +36,21 @@ body { } form { - max-width: 400px; - margin: 0 auto; + max-width: 90%; + margin: 0 auto; // Horisontalt sentrert border-radius: 10px; + min-width: 300px; + +} + +.form-control { + width: 90%; } .btn-primary { background-color: #010102; border-color: #010203; + width: 90%; &:hover { background-color: #6d1710; @@ -49,4 +61,8 @@ form { .profile-card { max-width: 90%; margin: 5px auto; -} \ No newline at end of file +} + +nav { + width: 100%; +} From 4d90f13bb89df40888e8bec76df74451439d07c0 Mon Sep 17 00:00:00 2001 From: Anders Hellerud Date: Mon, 20 May 2024 16:21:49 +0200 Subject: [PATCH 17/20] added script to start live server --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 2933a9735..d1053f264 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,8 @@ "description": "A starting point for the CSS Frameworks CA project", "scripts": { "test": "echo \"We will learn more about testing in the Workflow course\" && exit 1", - "build": "sass src/scss/main.scss:public/css/main.css --style compressed --watch" + "build": "sass src/scss/main.scss:public/css/main.css --style compressed --watch", + "start": "live-server" }, "repository": { From ff047b2eb38c0d630f06d759e41f82ae6deb6c2e Mon Sep 17 00:00:00 2001 From: Anders Hellerud Date: Mon, 20 May 2024 17:16:05 +0200 Subject: [PATCH 18/20] many fixes --- feed.html | 342 +++++++++++++++++++++++++++++++ src/index.html => index.html | 22 +- package-lock.json | 12 +- src/profile.html => profile.html | 78 +++---- public/css/main.css | 2 +- public/css/main.css.map | 2 +- src/feed.html | 64 ------ src/scss/main.scss | 14 +- 8 files changed, 413 insertions(+), 123 deletions(-) create mode 100644 feed.html rename src/index.html => index.html (82%) rename src/profile.html => profile.html (64%) delete mode 100644 src/feed.html diff --git a/feed.html b/feed.html new file mode 100644 index 000000000..2579eb406 --- /dev/null +++ b/feed.html @@ -0,0 +1,342 @@ + + + + + + + + + CSS Course Assignment + + +
+ +

CSS framework CA, Social Media Page

+
+
+
+
+ +
+ Newest + Oldest + Most Liked + Least Liked +
+
+
+
+ + +
+
+
+
+
+
+
+ Tags: Cool story, Nice +
+ +
+

This is a post

+

Here goes the text, maybe an image also?

+
+
Posted: 16.08.1987
+
Reactions: 2 likes
+
+
+ + +
+
+ + +
+
+ Geir Arne: Nice post! +
+
+ Durek: Great content! +
+
+
+
+
+
+
+
+
+ Tags: Cool story, Nice +
+ +
+

This is a post

+

Here goes the text, maybe an image also?

+
+
Posted: 16.08.1987
+
Reactions: 2 likes
+
+
+ + +
+
+ + +
+
+ Geir Arne: Nice post! +
+
+ Durek: Great content! +
+
+
+
+
+
+
+
+
+ Tags: Cool story, Nice +
+ +
+

This is a post

+

Here goes the text, maybe an image also?

+
+
Posted: 16.08.1987
+
Reactions: 2 likes
+
+
+ + +
+
+ + +
+
+ Geir Arne: Nice post! +
+
+ Durek: Great content! +
+
+
+
+
+
+
+
+
+ Tags: Cool story, Nice +
+ +
+

This is a post

+

Here goes the text, maybe an image also?

+
+
Posted: 16.08.1987
+
Reactions: 2 likes
+
+
+ + +
+
+ + +
+
+ Geir Arne: Nice post! +
+
+ Durek: Great content! +
+
+
+
+
+
+
+
+
+ Tags: Cool story, Nice +
+ +
+

This is a post

+

Here goes the text, maybe an image also?

+
+
Posted: 16.08.1987
+
Reactions: 2 likes
+
+
+ + +
+
+ + +
+
+ Geir Arne: Nice post! +
+
+ Durek: Great content! +
+
+
+
+
+
+
+
+
+ Tags: Cool story, Nice +
+ +
+

This is a post

+

Here goes the text, maybe an image also?

+
+
Posted: 16.08.1987
+
Reactions: 2 likes
+
+
+ + +
+
+ + +
+
+ Geir Arne: Nice post! +
+
+ Durek: Great content! +
+
+
+
+
+
+
+
+
+ Tags: Cool story, Nice +
+ +
+

This is a post

+

Here goes the text, maybe an image also?

+
+
Posted: 16.08.1987
+
Reactions: 2 likes
+
+
+ + +
+
+ + +
+
+ Geir Arne: Nice post! +
+
+ Durek: Great content! +
+
+
+
+
+
+
+
+
+ Tags: Cool story, Nice +
+ +
+

This is a post

+

Here goes the text, maybe an image also?

+
+
Posted: 16.08.1987
+
Reactions: 2 likes
+
+
+ + +
+
+ + +
+
+ Geir Arne: Nice post! +
+
+ Durek: Great content! +
+
+
+
+
+
+
+
+
+ Tags: Cool story, Nice +
+ +
+

This is a post

+

Here goes the text, maybe an image also?

+
+
Posted: 16.08.1987
+
Reactions: 2 likes
+
+
+ + +
+
+ + +
+
+ Geir Arne: Nice post! +
+
+ Durek: Great content! +
+
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/src/index.html b/index.html similarity index 82% rename from src/index.html rename to index.html index c4bc6b126..e6a7431c0 100644 --- a/src/index.html +++ b/index.html @@ -5,20 +5,20 @@ - + CSS Course Assignment -
+

CSS framework CA, Social Media Page

-
-
-
+ +
+
+
-
+

Enter site

-
+
@@ -35,8 +35,8 @@

Enter site

-
-
-
+ + + \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 5b94d6ae4..86805b13a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -134,9 +134,9 @@ } }, "node_modules/immutable": { - "version": "4.3.5", - "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.5.tgz", - "integrity": "sha512-8eabxkth9gZatlwl5TBuJnCsoTADlL6ftEr7A4qgdaTsPyreilDSnUk57SO+jfKcNtxPa22U5KK6DSeAYhpBJw==" + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.6.tgz", + "integrity": "sha512-Ju0+lEMyzMVZarkTn/gqRpdqd5dOPaz1mCZ0SH3JV6iFw81PldE/PEB1hWVEA288HPt4WXW8O7AWxB10M+03QQ==" }, "node_modules/is-binary-path": { "version": "2.1.0", @@ -207,9 +207,9 @@ } }, "node_modules/sass": { - "version": "1.74.1", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.74.1.tgz", - "integrity": "sha512-w0Z9p/rWZWelb88ISOLyvqTWGmtmu2QJICqDBGyNnfG4OUnPX9BBjjYIXUpXCMOOg5MQWNpqzt876la1fsTvUA==", + "version": "1.77.2", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.77.2.tgz", + "integrity": "sha512-eb4GZt1C3avsX3heBNlrc7I09nyT00IUuo4eFhAbeXWU2fvA7oXI53SxODVAA+zgZCk9aunAZgO+losjR3fAwA==", "dependencies": { "chokidar": ">=3.0.0 <4.0.0", "immutable": "^4.0.0", diff --git a/src/profile.html b/profile.html similarity index 64% rename from src/profile.html rename to profile.html index d80498f41..1c4a6c786 100644 --- a/src/profile.html +++ b/profile.html @@ -5,47 +5,47 @@ - + CSS Course Assignment -

My Profile

- +

My Profile

+ +
+
+
- User Avatar + User Avatar
-

Username: My userame

+

Username: My username

Name: My name

-

Email: My email@email.com

-

Age: 16

-

Gender: Yes

-

About: Here is something about me

+

Email: myemail@email.com

+

Age: 16

+

Gender: Yes

+

About: Here is something about me

-
+
-
+
-
+
+
-
+ +
+
-
+
- - + +
-
-
-
+ + + \ No newline at end of file diff --git a/public/css/main.css b/public/css/main.css index 54952133f..65784902a 100644 --- a/public/css/main.css +++ b/public/css/main.css @@ -1 +1 @@ -h1{color:#6d1710}body{font-family:"Roboto",sans-serif;display:flex;justify-content:center;align-items:center;flex-direction:column}.container{margin-top:50px;display:flex;flex-wrap:wrap;justify-content:center}.card{border:2px solid #343a40}.card-header{background-color:#fff;border-bottom:2px solid #343a40}.card-body{background-color:#f8f9fa}form{max-width:90%;margin:0 auto;border-radius:10px;min-width:300px}.form-control{width:90%}.btn-primary{background-color:#010102;border-color:#010203;width:90%}.btn-primary:hover{background-color:#6d1710;border-color:#6d1710}.profile-card{max-width:90%;margin:5px auto}nav{width:100%}/*# sourceMappingURL=main.css.map */ +h1{color:#6d1710}body{font-family:"Roboto",sans-serif;display:flex;justify-content:center;align-items:center;flex-direction:column}.container{margin-top:50px;display:flex;flex-wrap:wrap;justify-content:space-between}.card{border:2px solid #343a40}.card-header{background-color:#fff;border-bottom:2px solid #343a40}.card-body{background-color:#f8f9fa}form{max-width:90%;margin:0 auto;border-radius:10px;min-width:300px}.form-control{width:90%}.btn-primary{background-color:#010102;border-color:#010203;width:90%}.btn-primary:hover{background-color:#6d1710;border-color:#6d1710}.profile-card{max-width:90%;margin:5px auto}header{width:100%}nav{width:100%}#loginform{max-width:500px}article{margin:5px auto}/*# sourceMappingURL=main.css.map */ diff --git a/public/css/main.css.map b/public/css/main.css.map index be338e74e..1338f4cd1 100644 --- a/public/css/main.css.map +++ b/public/css/main.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","sources":["../../src/scss/main.scss"],"names":[],"mappings":"AAKA,GACE,MANkB,QASpB,KACE,gCACA,aACA,uBACA,mBACA,sBAGF,WACE,gBACA,aACA,eACA,uBAGF,MACE,yBAEA,aACE,sBACA,gCAGF,WACE,yBAIJ,KACE,cACA,cACA,mBACA,gBAIF,cACE,UAGF,aACE,yBACA,qBACA,UAEA,mBACE,yBACA,qBAIJ,cACE,cACA,gBAGF,IACE","file":"main.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["../../src/scss/main.scss"],"names":[],"mappings":"AAKA,GACE,MANkB,QASpB,KACE,gCACA,aACA,uBACA,mBACA,sBAGF,WACE,gBACA,aACA,eACA,8BAGF,MACE,yBAEA,aACE,sBACA,gCAGF,WACE,yBAIJ,KACE,cACA,cACA,mBACA,gBAIF,cACE,UAGF,aACE,yBACA,qBACA,UAEA,mBACE,yBACA,qBAIJ,cACE,cACA,gBAGF,OACE,WAGF,IACE,WAGF,WACE,gBAGF,QACE","file":"main.css"} \ No newline at end of file diff --git a/src/feed.html b/src/feed.html deleted file mode 100644 index 436160b7d..000000000 --- a/src/feed.html +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - CSS Course Assignment - - -

CSS framework CA, Social Media Page

- -
-
-
-
-
- Tags: Cool story, Nice -
- -
-

This is a post

-

Here goes the text, maybe an image also?

-
-
Posted: 16.08.1987
-
Reactions: 2 likes
-
-
- - -
-
- - -
-
- Geir Arne: Nice post! -
-
- Durek: Great content! -
-
-
-
-
-
- - \ No newline at end of file diff --git a/src/scss/main.scss b/src/scss/main.scss index d826602eb..4ef4790fc 100644 --- a/src/scss/main.scss +++ b/src/scss/main.scss @@ -19,7 +19,7 @@ body { margin-top: 50px; display: flex; flex-wrap: wrap; - justify-content: center; + justify-content: space-between; } .card { @@ -63,6 +63,18 @@ form { margin: 5px auto; } +header { + width: 100%; +} + nav { width: 100%; } + +#loginform { + max-width: 500px; +} + +article { + margin: 5px auto; +} \ No newline at end of file From be41906ad4c7962e318a76f60642c6c0a2e5c567 Mon Sep 17 00:00:00 2001 From: Anders Hellerud Date: Mon, 20 May 2024 17:19:49 +0200 Subject: [PATCH 19/20] changed filepath in build-script and added /dist in gitignore file --- .gitignore | 1 + package.json | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 541931a8f..2b0ef117f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ node_modules/ .DS_Store +dist/ diff --git a/package.json b/package.json index d1053f264..c299da398 100644 --- a/package.json +++ b/package.json @@ -4,9 +4,8 @@ "description": "A starting point for the CSS Frameworks CA project", "scripts": { "test": "echo \"We will learn more about testing in the Workflow course\" && exit 1", - "build": "sass src/scss/main.scss:public/css/main.css --style compressed --watch", + "build": "sass src/scss/main.scss:dist/css/main.css --style compressed --watch", "start": "live-server" - }, "repository": { "type": "git", @@ -30,4 +29,4 @@ "bootstrap": "^5.3.3", "sass": "^1.74.1" } -} +} \ No newline at end of file From 692e5db1cfb32ad87e2598357ca15311be8d6f9c Mon Sep 17 00:00:00 2001 From: Anders Hellerud Date: Tue, 21 May 2024 20:08:57 +0200 Subject: [PATCH 20/20] added many things --- feed.html | 35 ++++++++++++++++---------------- index.html | 7 +++---- profile.html | 50 +++++++++++++++++++++++++++++----------------- src/scss/main.scss | 11 ++++++++++ 4 files changed, 64 insertions(+), 39 deletions(-) diff --git a/feed.html b/feed.html index 2579eb406..d07ac3589 100644 --- a/feed.html +++ b/feed.html @@ -3,28 +3,30 @@ - - + CSS Course Assignment
- -

CSS framework CA, Social Media Page

+
@@ -337,6 +339,5 @@

This is a post

- \ No newline at end of file diff --git a/index.html b/index.html index e6a7431c0..7911d518e 100644 --- a/index.html +++ b/index.html @@ -3,9 +3,8 @@ - - + CSS Course Assignment @@ -14,7 +13,7 @@

CSS framework CA, Social Media Page

-
+

Enter site

@@ -31,7 +30,7 @@

Enter site

Log in Register - +
diff --git a/profile.html b/profile.html index 1c4a6c786..5e04bc0ca 100644 --- a/profile.html +++ b/profile.html @@ -3,40 +3,52 @@ - - + CSS Course Assignment
- -

My Profile

-
+ +
+
+

Username: My username

+
+
Followers
+

99k

+
+
+
Following
+

200

+
+
User Avatar
-

Username: My username

Name: My name

Email: myemail@email.com

Age: 16

@@ -85,5 +97,7 @@
Post Title 3
+ + \ No newline at end of file diff --git a/src/scss/main.scss b/src/scss/main.scss index 4ef4790fc..49a9ac426 100644 --- a/src/scss/main.scss +++ b/src/scss/main.scss @@ -1,3 +1,5 @@ +@import "../../node_modules/bootstrap/scss/bootstrap"; + $primary-h1-colour: #6d1710; $primary-btn-colour: black; $profile-card-margin: 5px; @@ -73,8 +75,17 @@ nav { #loginform { max-width: 500px; + + &-button { + margin-top: 5px; + } } article { margin: 5px auto; +} + +#userName { + font-size:x-large; + font-weight: 800; } \ No newline at end of file