diff --git a/.gitignore b/.gitignore index 5a670e940..2b0ef117f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ node_modules/ .DS_Store dist/ + diff --git a/README.md b/README.md index 9afc742da..17d650a43 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,10 @@ # css-frameworks-ca -Replace this text with a description of your social media project. + +##### This is a simple 3 page social media site built with html and bootstrap. No functionality. + +## Installation + +#### git clone +#### git npm install +#### npm start + diff --git a/feed.html b/feed.html new file mode 100644 index 000000000..d07ac3589 --- /dev/null +++ b/feed.html @@ -0,0 +1,343 @@ + + + + + + + + CSS Course Assignment + + +
+ +
+
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+

This is a post

+

Here goes the text, maybe an image also?

+
+ +
Reactions: 2 likes
+
+
+ + +
+
+ + +
+
+ Geir Arne: Nice post! +
+
+ Durek: Great content! +
+
+
+
+
+
+
+
+ + +
+

This is a post

+

Here goes the text, maybe an image also?

+
+ +
Reactions: 2 likes
+
+
+ + +
+
+ + +
+
+ Geir Arne: Nice post! +
+
+ Durek: Great content! +
+
+
+
+
+
+
+
+ + +
+

This is a post

+

Here goes the text, maybe an image also?

+
+ +
Reactions: 2 likes
+
+
+ + +
+
+ + +
+
+ Geir Arne: Nice post! +
+
+ Durek: Great content! +
+
+
+
+
+
+
+
+ + +
+

This is a post

+

Here goes the text, maybe an image also?

+
+ +
Reactions: 2 likes
+
+
+ + +
+
+ + +
+
+ Geir Arne: Nice post! +
+
+ Durek: Great content! +
+
+
+
+
+
+
+
+ + +
+

This is a post

+

Here goes the text, maybe an image also?

+
+ +
Reactions: 2 likes
+
+
+ + +
+
+ + +
+
+ Geir Arne: Nice post! +
+
+ Durek: Great content! +
+
+
+
+
+
+
+
+ + +
+

This is a post

+

Here goes the text, maybe an image also?

+
+ +
Reactions: 2 likes
+
+
+ + +
+
+ + +
+
+ Geir Arne: Nice post! +
+
+ Durek: Great content! +
+
+
+
+
+
+
+
+ + +
+

This is a post

+

Here goes the text, maybe an image also?

+
+ +
Reactions: 2 likes
+
+
+ + +
+
+ + +
+
+ Geir Arne: Nice post! +
+
+ Durek: Great content! +
+
+
+
+
+
+
+
+ + +
+

This is a post

+

Here goes the text, maybe an image also?

+
+ +
Reactions: 2 likes
+
+
+ + +
+
+ + +
+
+ Geir Arne: Nice post! +
+
+ Durek: Great content! +
+
+
+
+
+
+
+
+ + +
+

This is a post

+

Here goes the text, maybe an image also?

+
+ +
Reactions: 2 likes
+
+
+ + +
+
+ + +
+
+ Geir Arne: Nice post! +
+
+ Durek: Great content! +
+
+
+
+
+
+ + + + \ No newline at end of file diff --git a/index.html b/index.html new file mode 100644 index 000000000..7911d518e --- /dev/null +++ b/index.html @@ -0,0 +1,41 @@ + + + + + + + + CSS Course Assignment + + +
+

CSS framework CA, Social Media Page

+
+
+
+
+
+
+

Enter site

+
+
+
+
+ + +
+
+ + +
+ Log in + Register + +
+
+
+
+
+
+ + \ No newline at end of file diff --git a/media/avatar.jpg b/media/avatar.jpg new file mode 100644 index 000000000..d7ff00d07 Binary files /dev/null and b/media/avatar.jpg differ diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 000000000..86805b13a --- /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.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", + "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.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", + "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..c299da398 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,9 @@ "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:dist/css/main.css --style compressed --watch", + "start": "live-server" }, "repository": { "type": "git", @@ -22,5 +24,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" + } +} \ No newline at end of file diff --git a/profile.html b/profile.html new file mode 100644 index 000000000..5e04bc0ca --- /dev/null +++ b/profile.html @@ -0,0 +1,103 @@ + + + + + + + + CSS Course Assignment + + +
+ +
+
+
+
+ +
+
+
+ + + + \ No newline at end of file diff --git a/public/css/main.css b/public/css/main.css new file mode 100644 index 000000000..65784902a --- /dev/null +++ b/public/css/main.css @@ -0,0 +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: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 new file mode 100644 index 000000000..1338f4cd1 --- /dev/null +++ b/public/css/main.css.map @@ -0,0 +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,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/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/index.scss b/src/scss/index.scss deleted file mode 100644 index 8b1378917..000000000 --- a/src/scss/index.scss +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/scss/main.scss b/src/scss/main.scss new file mode 100644 index 000000000..49a9ac426 --- /dev/null +++ b/src/scss/main.scss @@ -0,0 +1,91 @@ +@import "../../node_modules/bootstrap/scss/bootstrap"; + +$primary-h1-colour: #6d1710; +$primary-btn-colour: black; +$profile-card-margin: 5px; + + +h1 { + color: $primary-h1-colour; +} + +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; + + &-header { + background-color: #fff; + border-bottom: 2px solid #343a40; + } + + &-body { + background-color: #f8f9fa; + } +} + +form { + 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; + border-color: #6d1710; + } +} + +.profile-card { + max-width: 90%; + margin: 5px auto; +} + +header { + width: 100%; +} + +nav { + width: 100%; +} + +#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