Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
c45f394
installed compendensies
flanderos Apr 5, 2024
b844bd6
added html filers and fixed css setup
flanderos Apr 14, 2024
a374201
added simple login page
flanderos Apr 14, 2024
ea579b2
added a lot of work without commiting or pushing
flanderos May 5, 2024
3a8978b
Update README.md
flanderos May 5, 2024
5c651aa
Update README.md
flanderos May 5, 2024
a2c35d3
Update README.md
flanderos May 5, 2024
07fc161
Update README.md
flanderos May 5, 2024
cc9a473
Merge pull request #1 from flanderos/dev
flanderos May 5, 2024
ab5c80d
removed dist
flanderos May 6, 2024
523a4fd
added minlengt 8 to password field
flanderos May 6, 2024
cec8ccb
added minlenght 8 to password field
flanderos May 6, 2024
299065b
added buttons for add friend and message
flanderos May 6, 2024
8432a48
Merge pull request #2 from flanderos/feedback
flanderos May 15, 2024
4f90dcc
made alle the required changes
flanderos May 19, 2024
3c3187e
Merge pull request #3 from flanderos/more-feedback-fixes
flanderos May 19, 2024
dd98e9c
Delete feed.html
flanderos May 19, 2024
9fa57c0
Delete profile.html
flanderos May 19, 2024
6c687a7
Merge pull request #4 from flanderos/more-feedback-fixes
flanderos May 19, 2024
2fbe570
last fixes
flanderos May 19, 2024
4d90f13
added script to start live server
flanderos May 20, 2024
ae16cdc
Update README.md
flanderos May 20, 2024
d454bb8
Update README.md
flanderos May 20, 2024
ff047b2
many fixes
flanderos May 20, 2024
be41906
changed filepath in build-script and added /dist in gitignore file
flanderos May 20, 2024
692e5db
added many things
flanderos May 21, 2024
a32a373
Merge pull request #5 from flanderos/feedback
flanderos May 21, 2024
a5d2c71
made a lot of changes
flanderos Oct 20, 2024
99b0b12
re-styled entire profile.html
flanderos Oct 20, 2024
70de31c
just alot of styling
flanderos Oct 20, 2024
ce7372f
removed all css, edited bootstrap variables
flanderos Oct 23, 2024
62672f5
Update README.md
flanderos Oct 24, 2024
6ee9984
Update feed.html
flanderos Oct 24, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
node_modules/
.DS_Store
dist/

11 changes: 10 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,11 @@
# 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 https://github.com/flanderos/css-frameworks-ca/tree/redelivery
#### npm install
#### npm run build
#### npm start

381 changes: 381 additions & 0 deletions feed.html

Large diffs are not rendered by default.

49 changes: 49 additions & 0 deletions index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link href="https://fonts.googleapis.com/css2?family=Roboto&display=swap" rel="stylesheet">
<link rel="stylesheet" href="/dist/css/main.css">
<title>CSS Course Assignment</title>
</head>
<body class="bg-secondary">
<header class="bg-primary text-secondary">
<h1 class="display-5 text-center">CSS Framework CA, Social Media Page</h1>
</header>
<main class="mt-5">
<div class="container rounded">
<div class="bg-white text-center">
<h2 class="display-3">Enter site</h2>
</div>
<div class="card p-4">
<form id="login-form" action="profile.html">
<div class="form-group">
<label for="email">E-mail:</label>
<input type="email" id="email" name="email" class="form-control" placeholder="email" required>
</div>
<div class="form-group">
<label for="password">Password:</label>
<input type="password" id="password" name="password" class="form-control" required minlength="8">
</div>
<button type="submit" class="btn btn-primary btn-block mt-3 id="loginform-button" >Log in <i class="fa-solid fa-right-to-bracket"></i></button>
</form>
</div>
</div>
</main>
<section class="container mt-5">
<div>
<h2>About</h2>
<p id="aboutText">This is my CSS Framework project to display functional Bootstrap and scss.
The site is not functional</p>
<p>The site is build with the following technology:</p>
<ul id="techlist">
<li>HTML</li>
<li>SASS/SCSS</li>
<li>Bootstrap</li>
</ul>
</div>
</section>
<script src="https://kit.fontawesome.com/00a541403c.js" crossorigin="anonymous"></script>
</body>
</html>
Binary file added media/avatar.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/will.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
244 changes: 244 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 12 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -17,10 +19,14 @@
"SCSS",
"SASS"
],
"author": "Oliver Dipple <oliver.dipple@noroff.no>",
"license": "ISC",
"author": "Anders Hellerud",
"license": "",
"bugs": {
"url": "https://github.com/NoroffFEU/css-frameworks-ca/issues"
"url": ""
},
"homepage": "https://github.com/NoroffFEU/css-frameworks-ca#readme"
}
"homepage": "",
"dependencies": {
"bootstrap": "^5.3.3",
"sass": "^1.74.1"
}
}
Loading