Skip to content

Commit

Permalink
Merge pull request #62 from ristekoss/staging
Browse files Browse the repository at this point in the history
Release : revamp landing page and Schedule View
  • Loading branch information
fajarriv authored Aug 4, 2023
2 parents 0efdcab + f7da344 commit e590df0
Show file tree
Hide file tree
Showing 48 changed files with 4,034 additions and 422 deletions.
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"@emotion/styled": "^11",
"@fontsource/poppins": "^4.4.5",
"@heroicons/react": "^1.0.2",
"@react-spring/web": "^9.7.3",
"axios": "^0.19.0",
"copy-image-clipboard": "^2.1.2",
"framer-motion": "^4",
Expand All @@ -18,6 +19,7 @@
"react": "^16.8.6",
"react-burger-menu": "^2.6.10",
"react-copy-to-clipboard": "^5.0.1",
"react-countup": "^6.4.2",
"react-dom": "^16.8.6",
"react-ga": "^3.3.0",
"react-helmet": "^5.2.1",
Expand Down
58 changes: 29 additions & 29 deletions src/assets/Beta/Beta_Logo_Dark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
58 changes: 29 additions & 29 deletions src/assets/Beta/Beta_Logo_Light.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions src/assets/Beta/chevron-up.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
255 changes: 255 additions & 0 deletions src/assets/Beta/discord-lg.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
292 changes: 292 additions & 0 deletions src/assets/Beta/discord-sm.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
475 changes: 475 additions & 0 deletions src/assets/Beta/illustration-lg.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
480 changes: 480 additions & 0 deletions src/assets/Beta/illustration-sm.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions src/assets/Beta/link.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions src/assets/Beta/makara.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions src/assets/Beta/total-jadwal.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions src/assets/Beta/total-user.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions src/assets/Dosen-dark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions src/assets/Dosen.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions src/assets/Jam-Matkul-dark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions src/assets/Jam-Matkul.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 15 additions & 0 deletions src/assets/ListMatkulIcon.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import React from "react";

export const ListMatkulIcon = (props) => {
return (
<svg
xmlns="http://www.w3.org/2000/svg"
width="20"
height="20"
fill="currentColor"
viewBox="0 0 24 25"
>
<path d="M21.375 5H7.687a.188.188 0 00-.187.188V6.5c0 .103.084.188.188.188h13.687a.188.188 0 00.188-.188V5.187A.188.188 0 0021.375 5zm0 6.656H7.687a.188.188 0 00-.187.188v1.312c0 .103.084.188.188.188h13.687a.188.188 0 00.188-.188v-1.312a.188.188 0 00-.188-.188zm0 6.656H7.687a.188.188 0 00-.187.188v1.313c0 .103.084.187.188.187h13.687a.188.188 0 00.188-.188V18.5a.188.188 0 00-.188-.188zM2.437 5.845a1.312 1.312 0 102.625 0 1.312 1.312 0 00-2.625 0zm0 6.656a1.313 1.313 0 102.626 0 1.313 1.313 0 00-2.625 0zm0 6.656a1.312 1.312 0 102.625 0 1.312 1.312 0 00-2.625 0z"></path>
</svg>
);
};
5 changes: 5 additions & 0 deletions src/assets/Ruang-Kelas-dark.svg
5 changes: 5 additions & 0 deletions src/assets/Ruang-Kelas.svg
5 changes: 5 additions & 0 deletions src/assets/Total-Sks-dark.svg
5 changes: 5 additions & 0 deletions src/assets/Total-Sks.svg
3 changes: 3 additions & 0 deletions src/assets/caret.svg
51 changes: 51 additions & 0 deletions src/components/Illustration.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
import React from "react";
import styled from "styled-components";
import { useSelector } from "react-redux";

import illustrationDesktop from "assets/Beta/illustration-lg.svg";
import illustrationMobile from "assets/Beta/illustration-sm.svg";

const AssetIllustration = styled.img`
position: absolute;
right: 0;
top: ${({ isPrivate }) => (isPrivate ? "81px" : "0")};
display:none
@media (min-width: 1200px) {
display: block
width: 40rem;
}
${(props) =>
props.isMobile &&
`
width: 100%;
display: block;
@media (min-width: 480px) {
display: none;
}
`}
`;

export const Illustration = ({ isPrivate }) => {
const isMobile = useSelector((state) => state.appState.isMobile);

return (
<>
{isMobile ? (
<AssetIllustration
isMobile={isMobile}
src={illustrationMobile}
alt="illustration-sm"
/>
) : (
<AssetIllustration
isPrivate={isPrivate}
src={illustrationDesktop}
alt="illustration-lg"
/>
)}
</>
);
};
Loading

0 comments on commit e590df0

Please sign in to comment.