Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/fg 98 #793

Merged
merged 28 commits into from
Apr 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
b9c919b
fått enkel innlogging til å funke
Gissebass Dec 14, 2023
90c6b46
fått create user til å funke ish
Gissebass Dec 19, 2023
003f7e0
fixed login in header
Gissebass Dec 22, 2023
a6cf818
unstable finished
Gissebass Dec 23, 2023
cf2760d
change api endpoint fro 8080 to 8000
Gissebass Dec 23, 2023
3edd1fe
kommentert ut litt kode som skal brukes senere.
Gissebass Dec 23, 2023
cdd9e4f
updated browser-list-db because azure static check asked me to do so
Gissebass Dec 23, 2023
8f4f30a
added linebreak to run azure static web apps i github
Gissebass Dec 27, 2023
1cd21fc
lagt til createUser komponent
PTB03 Jan 28, 2024
37a58a2
Det funker plz!
PTB03 Feb 1, 2024
f1ff547
Lagt til knapp til å komme seg tilbake til arkivsjef side
PTB03 Feb 8, 2024
7b44b33
Lagt til input for fornavn og etternav,endret på styling også
PTB03 Feb 9, 2024
ba6519e
begynt på side for endring av photgangbangers
PTB03 Feb 22, 2024
06aff8e
FIX AZURE error lol
PTB03 Feb 22, 2024
32fc90c
lagt til mulighet til å redigere info til en photogangbanger
PTB03 Mar 1, 2024
d1b3abc
Fikset og stylet redigeringSide, kan nå trykke på switch for om bruke…
PTB03 Mar 7, 2024
ec6e1c1
Slettet noen console logs
PTB03 Mar 7, 2024
5ae0fc3
Fjerne enda none til console logs
PTB03 Mar 7, 2024
be63b64
Merge branch 'master' into feature/fg-94
PTB03 Mar 7, 2024
83396c7
Dummy commit
PTB03 Mar 7, 2024
5ce6bf9
oppdatert Azure/msal/browser
PTB03 Mar 14, 2024
3a8c91f
Merge branch 'feature/fg-94' of https://github.com/Fotogjengen/hilfli…
PTB03 Mar 14, 2024
453fee8
Endret noen små feil
PTB03 Mar 14, 2024
d3bdee0
slettet kommentar
PTB03 Mar 14, 2024
5d915ad
Endret på utsende på gridImageViewer, ser litt bedre ut nå
PTB03 Mar 17, 2024
e7f5213
Gjorde rammene rundt bildene litt tynnere
PTB03 Mar 17, 2024
326101d
Merge branch 'master' of https://github.com/Fotogjengen/hilfling-fron…
PTB03 Mar 20, 2024
7b9ccb8
Removed som consol logs and comments
PTB03 Mar 20, 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
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,6 @@ const ArchiveBossCreateUser = () => {
const createUser = async () => {

const displayName = `${givenName} ${surname}`

console.log("JAJAJA");
console.log("Display Name:", displayName);



const apiUrl = "https://graph.microsoft.com/v1.0/users";
const newUser = {
Expand Down
8 changes: 3 additions & 5 deletions src/components/ImageViewer/GridImageViewer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,13 @@ const ShowMotive: FC<Props> = ({ photos }) => {
return (
<>
<div className={styles.backgroundFlex}>
<div className={styles.filterAndImages}>

<div className={styles.flex}>
{imageItems}
{/*TODO: remove filling elements, this is a temp fix! This fix ensures that the first image in a row always is at the far left. FInd a better method for doing this */}
<div className={styles.fillingEmptySpaceChilds} />
<div className={styles.fillingEmptySpaceChilds} />
<div className={styles.fillingEmptySpaceChilds} />

</div>
</div>

</div>
</>
);
Expand Down
2 changes: 1 addition & 1 deletion src/components/ImageViewer/MotiveImage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const MotiveImage: FC<Props> = ({
return (
<>
<div className={styles.motiveImage} onClick={() => updateIndex(index)}>
<img src={image} height="200px" width="300px" />
<img src={image} width="250px" />
<div className={styles.imageContainer}>
<p className={styles.imageTitle}>{title}</p>
<p className={styles.imageTitle}>31.08.21</p>
Expand Down
39 changes: 28 additions & 11 deletions src/components/ImageViewer/imageStyle.module.css
Original file line number Diff line number Diff line change
@@ -1,8 +1,20 @@


.motiveImage {
height: 200px;
width: 300px;
box-shadow: 0px 4px 4px 0px rgba(0,0,0, 0.25);
background-color: #F3F3F3;
width: 256px;
height: 172px;
box-shadow: 2px 4px 4px 2px rgba(0,0,0, 0.25);
background-color: white;
position: relative;

}

.motiveImage img{
margin: 10px auto;
position: absolute;
left: 3px;
bottom: -7px;

}

.motiveImage:hover {
Expand All @@ -13,9 +25,13 @@
display: flex;
flex-direction: row;
flex-wrap: wrap;
justify-content: space-around;
justify-content: center;
gap: 10px;
margin: 0px;

}


.filling-empty-space-childs {
width:300px;
padding: 0px;
Expand All @@ -28,12 +44,13 @@
flex: 1;
}



.backgroundFlex {
display: flex;
flex-direction: column;
height: 100%;
width: 100%;
background-color: white;
border-radius: 5px;
}

Expand Down Expand Up @@ -102,13 +119,13 @@
}

.imageContainer {
position: relative;
bottom: 50px;
left: 0px;
position: absolute;
bottom: 3px;
left: 3px;
background-color: #000000;
opacity: 0.3;
height: 43px;
width: 100%;
width: 250px;
}

.imageTitle {
Expand All @@ -120,4 +137,4 @@
background-color: "#000000";
height: 2px;
width: 95%;
}
}
2 changes: 1 addition & 1 deletion src/views/Search/Search.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import styles from "./Searchbar.module.css";
const Search = () => {
return (
<div>
<div className={styles.backgroundFlex}>
<div className={styles.backgroundFlex} style={{backgroundColor: "white"}}>
<SearchField />
</div>
<h2>De 20 nyligste bildene:</h2>
Expand Down
1 change: 0 additions & 1 deletion src/views/Search/Searchbar.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
flex-direction: column;
height: 100%;
width: 100%;
background-color: white;
border-radius: 5px;
padding:1.5px;
}
Expand Down
Loading