+
🥈
@@ -19,7 +34,9 @@ 🥈
-
+
+
+
🥉
@@ -35,11 +52,18 @@ 🥉
+
+
+
+
-
Upvote or Downvote your favourite cat to reveal another one ...
-
-
+
+
Upvote or Downvote your favourite cat to reveal another one ...
+
+
+
+
\ No newline at end of file
diff --git a/src/app/cats/cats.component.scss b/src/app/cats/cats.component.scss
index e69de29..8b57293 100644
--- a/src/app/cats/cats.component.scss
+++ b/src/app/cats/cats.component.scss
@@ -0,0 +1,38 @@
+.golden{
+ background-image: url('../../assets/goldenframe.png');
+ background-repeat:no-repeat;
+ background-size: contain;
+}
+
+.gframe {
+ border: 10px solid rgba(212, 175, 55, 0.76);
+ background-color: rgba(212, 175, 55, 0.76);
+ }
+
+ .sframe {
+ border: 10px solid rgba(248,248,255);
+ background-color: rgba(248,248,255);
+ color: grey;
+ }
+
+ .bframe {
+ border: 10px solid rgba(80.4, 49.8, 19.6);
+ background-color: rgba(80.4, 49.8, 19.6);
+ }
+
+ .imgframe {
+ background-repeat: no-repeat;
+ background-size: 100%;
+ background-position: center;
+ width: 100%;
+ height: 100%;
+ background-size: contain;
+
+ }
+
+ .leaderbackground{
+
+ background-image: linear-gradient(to right, #fa709a 0%, #fee140 100%);
+
+ }
+
diff --git a/src/app/config/config.model.ts b/src/app/config/config.model.ts
index fbf79c8..41346a8 100644
--- a/src/app/config/config.model.ts
+++ b/src/app/config/config.model.ts
@@ -12,4 +12,5 @@ export interface KeycloakOpts {
clientId: string;
redirectUri: string;
enableLogging?: boolean;
+ enabled?: boolean;
}
diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html
index d2baf27..3ee7152 100644
--- a/src/app/home/home.component.html
+++ b/src/app/home/home.component.html
@@ -1,14 +1,24 @@
-
-
It's Cat Vs Cat in this purrfect competition.
-
- The challenge is tough as these cats are all very fur-midable! There can be only one winner in this a-paw-ling
- competition, could you pawsibly choose just one cat?? You must be kitten-me!!
+
+
+
+
@@ -39,4 +49,4 @@ Add your cat 🐈
-
+
diff --git a/src/app/home/home.component.scss b/src/app/home/home.component.scss
index ee5b4b1..4edc8b6 100644
--- a/src/app/home/home.component.scss
+++ b/src/app/home/home.component.scss
@@ -4,3 +4,32 @@
height: auto;
max-height: 300px;
}
+
+
+.overlay
+{
+background-color: rgba(50,50,52,0.7);
+border: 3px solid #fff;
+border-radius: 5px;
+float: right;
+margin: 0 auto;
+max-width: 570px;
+padding: 20px 0 50px;
+text-align: center;
+width: 100%;
+}
+
+.btn-contest {
+ background-color: #F78020;
+ //border: 3px solid #fff;
+ border-radius: 10px;
+ box-shadow: 0 4px 6px rgba(0,0,0,0.35),0 -5px 0 rgba(0,0,0,0.2) inset;
+ color: #fff;
+ font: 14px/1.7 'odudabold', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+ text-transform: uppercase;
+ width: 70%;
+}
+.headerbackground
+{
+ background-image: linear-gradient( 64.3deg, rgba(254,122,152,0.81) 17.7%, rgba(255,206,134,1) 64.7%, rgba(172,253,163,0.64) 112.1% );
+}
\ No newline at end of file
diff --git a/src/app/shell/header/header.component.html b/src/app/shell/header/header.component.html
index 996062d..a669097 100644
--- a/src/app/shell/header/header.component.html
+++ b/src/app/shell/header/header.component.html
@@ -1,12 +1,15 @@
-
-
+
+
+
+
+
- Pet Battle
+
-
diff --git a/src/app/shell/header/header.component.scss b/src/app/shell/header/header.component.scss
index c4e8bd6..3e8d973 100644
--- a/src/app/shell/header/header.component.scss
+++ b/src/app/shell/header/header.component.scss
@@ -4,6 +4,34 @@
margin-bottom: $spacer;
}
-.nav-link.dropdown-toggle {
- cursor: pointer;
+.header-main-wrap {
+ background: #e00;
+ position: relative;
+ z-index: 0;
}
+
+.header-main span {
+ display: inline-block;
+ /* font-size: 16px; */
+ line-height: 1;
+ color: rgba(255,255,255,0.9);
+ /* text-transform: capitalize; */
+ transition: 0.3s all ease;
+}
+
+
+.header-text {
+ display: inline-block;
+ /* font-size: 16px; */
+ line-height: 1.15;
+ color: rgba(255,255,255,0.9);
+ /* text-transform: capitalize; */
+ transition: 0.3s all ease;
+}
+
+
+
+.headerbackground
+{
+ background-image: linear-gradient( 64.3deg, rgba(254,122,152,0.81) 17.7%, rgba(255,206,134,1) 64.7%, rgba(172,253,163,0.64) 112.1% );
+}
\ No newline at end of file
diff --git a/src/app/winner/winner.component.html b/src/app/winner/winner.component.html
index 3b30851..3659079 100644
--- a/src/app/winner/winner.component.html
+++ b/src/app/winner/winner.component.html
@@ -1,8 +1,22 @@
-
-
This weeks Top Cat is ....
-
-
+
+
+
+
+
This week's winner is
+
+
+
+
+
+
+
+
-
Ginger Spice, from London
+
+
+
+
Ginger spice from London
+
\ No newline at end of file
diff --git a/src/assets/configuration/config.json b/src/assets/configuration/config.json
index e191429..9cb864f 100644
--- a/src/assets/configuration/config.json
+++ b/src/assets/configuration/config.json
@@ -3,6 +3,7 @@
"tournamentsUrl": "https://pet-battle-tournament-labs-test.apps.hivec.sandbox1405.opentlc.com",
"matomoUrl": "https://matomo-labs-ci-cd.apps.hivec.sandbox1405.opentlc.com/",
"keycloak": {
+ "enabled": true,
"url": "https://keycloak-labs-test.apps.hivec.sandbox1405.opentlc.com/auth/",
"realm": "pbrealm",
"clientId": "pbclient",
diff --git a/src/assets/pet_battle_logo.jpg b/src/assets/pet_battle_logo.jpg
new file mode 100644
index 0000000..ed27f3e
Binary files /dev/null and b/src/assets/pet_battle_logo.jpg differ
diff --git a/src/assets/pet_component_logo.jpg b/src/assets/pet_component_logo.jpg
new file mode 100644
index 0000000..31f5b96
Binary files /dev/null and b/src/assets/pet_component_logo.jpg differ
diff --git a/src/assets/podium.jpg b/src/assets/podium.jpg
new file mode 100644
index 0000000..d543ed0
Binary files /dev/null and b/src/assets/podium.jpg differ
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 2453b90..192b26d 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -18,6 +18,8 @@ export const environment = {
defaultLanguage: 'en-US',
supportedLanguages: ['en-US', 'fr-FR'],
keycloak: {
+ //Option to skip Keycloak setup for local runs
+ enabled: false,
// Url of the Identity Provider
issuer: 'http://localhost:8080/auth/realms/pbrealm',
diff --git a/src/theme/theme-variables.scss b/src/theme/theme-variables.scss
index 812d56e..5c79c0a 100644
--- a/src/theme/theme-variables.scss
+++ b/src/theme/theme-variables.scss
@@ -2,6 +2,14 @@
* Application global variables.
*/
+
+// Use Bootstrap defaults for other variables, imported here so we can access all app variables in one place when used
+// in components.
+@import "~bootstrap/scss/_functions";
+@import "~bootstrap/scss/_variables";
+@import url('https://fonts.googleapis.com/css2?family=Zen+Kaku+Gothic+Antique&display=swap');
+@import url('https://fonts.googleapis.com/css2?family=Noto+Sans+TC&display=swap');
+@import url('https://fonts.googleapis.com/css2?family=Montserrat:ital,wght@0,100;1,100&display=swap');
// Set Font Awesome font path
$fa-font-path: "~@fortawesome/fontawesome-free/webfonts";
@@ -14,7 +22,7 @@ $fa-font-path: "~@fortawesome/fontawesome-free/webfonts";
//
// Color system
//
-
+$btn-border-radius :0;
$white: #fff;
$gray-100: #f8f9fa;
$gray-200: #e9ecef;
@@ -48,8 +56,3 @@ $theme-colors: (
light: $gray-100,
dark: $gray-800
);
-
-// Use Bootstrap defaults for other variables, imported here so we can access all app variables in one place when used
-// in components.
-@import "~bootstrap/scss/_functions";
-@import "~bootstrap/scss/_variables";
diff --git a/tsconfig.json b/tsconfig.json
index e5e268b..38ab026 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -21,6 +21,7 @@
}
},
"angularCompilerOptions": {
- "preserveWhitespaces": true
+ "preserveWhitespaces": true,
+ "enableIvy": false
}
}
+ 
+