bbgmsys / SKC (public) (License: MIT) (since 2020-02-14) (hash sha1)
Shingitai Karate Club
Clone URLs: https://rocketgit.com/user/bbgmsys/SKC ssh://rocketgit@ssh.rocketgit.com/user/bbgmsys/SKC git://git.rocketgit.com/user/bbgmsys/SKC
Merge request 1 (c03107f8d31bdc23368f52c231ca38248705a50a -> 547247015cde9935ddf7ab04dd97a72ec319487b)
By: bitvice
Against ref: refs/heads/develop
Date: 2020-05-14 06:01
This merge request can be merged without conflicts.
List of commits:
Subject Hash Author Date (UTC)
feat(vulcan): detalii campioni Vulcan 547247015cde9935ddf7ab04dd97a72ec319487b bbgmsys 2020-05-13 21:02:25
feat(skc): Added Netlify status badge to readme. 19a670c79ed4595385998eb121b4c4bd282df8cb bbgmsys 2020-04-09 08:11:32
feat(karate,fitness): Embed some videos. 2b040d32f655004d89d430ae15b5a742f06d8a99 bbgmsys 2020-04-08 22:52:03
Commit 547247015cde9935ddf7ab04dd97a72ec319487b - feat(vulcan): detalii campioni Vulcan
Author: bbgmsys
Author date (UTC): 2020-05-13 21:02
Committer name: bbgmsys
Committer date (UTC): 2020-05-13 21:02
Parent(s): 19a670c79ed4595385998eb121b4c4bd282df8cb
Signing key:
Tree: 2ecc8b8eba964e40ed21aff45ed63ecc9e1db2da
File Lines added Lines deleted
pages/karate-vulcan.vue 36 7
pages/karate.vue 13 0
File pages/karate-vulcan.vue changed (mode: 100644) (index 9bd250e..e503352)
... ... Tot în acest an, Senpai Mihail Preda devine instructor al clubului "Shingitai K
65 65 <b-row> <b-row>
66 66 <b-col md="6"> <b-col md="6">
67 67 <aside class="oBand_text" aria-labelledby="#Section1Title"> <aside class="oBand_text" aria-labelledby="#Section1Title">
68 <h2 id="Section1Title">Shingitai Karate Club - Vulcan</h2>
68 <h2 id="Section1Title">Dutca Antonio</h2>
69 <div><b>Data nasterii: 21.07.2006</b></div>
70 <div><b>grad-2 kyu</b></div>
71 <p>Palmares:</p>
72 <ul>
73 <li>Campion Mondial -2018,proba,kata echipe, 🏆</li>
74 <li>Medalie de bronz la proba kata individual, Campionatul Mondial 2018. 🥈</li>
75 <li>Medalie de bronz la proba de kumite, Campionatul Mondial 2018, 🥈</li>
76 <li>Campion National-2018, proba, kata echipe, 🏆 </li>
77 <li>Campion National-2019, proba kata echipe, 🏆</li>
78 <li>Vicecampion National-2013, 2017, 2018 kata, 🏆</li>
79 <li>Vicecampion National-2018, kumite, 🏆</li>
80 <li>Medalie de bronz-kata individual, Campionatul National-2019, 🥈</li>
81 <li>Medalie de bronz-kumite, Campionatul National-2019 🥈</li>
82 </ul>
69 83 </aside> </aside>
70 84 </b-col> </b-col>
71 <div class="oBand_img toRight-lapUp" style="background-image: url('/images/vulcan/vulcan_06.jpg'); background-position: top center;"></div>
85 <div class="oBand_img toRight-lapUp" style="background-image: url('/images/vulcan/vulcan_07.jpg'); background-position: top center;"></div>
72 86 </b-row> </b-row>
73 87 </band> </band>
74 88
75 89 <band theme="Light" id="Vulcan2"> <band theme="Light" id="Vulcan2">
76 90 <b-row> <b-row>
77 <div class="oBand_img toLeft-lapUp" style="background-image: url('/images/vulcan/vulcan_07.jpg'); background-position: center top;"></div>
91 <div class="oBand_img toLeft-lapUp" style="background-image: url('/images/vulcan/vulcan_08.jpg'); background-position: center top;"></div>
78 92 <b-col md="6"></b-col> <b-col md="6"></b-col>
79 93 <b-col md="6"> <b-col md="6">
80 94 <aside class="oBand_text" aria-labelledby="#SectionClujTitle"> <aside class="oBand_text" aria-labelledby="#SectionClujTitle">
81 <h2 id="SectionClujTitle">Shingitai Karate Club - Vulcan</h2>
95 <h2 id="SectionClujTitle">Gherman Eduard</h2>
96 <div><b>Data nasterii: 23.08.2011</b></div>
97 <div><b>grad-8 kyu</b></div>
98 <p>Palmares:</p>
99 <ul>
100 <li>Campion National-2018,proba kata individual, 🏆</li>
101 <li>Vicecampion National-2019,proba kumite,🥈</li>
102 <li>Vicecampion National-2019,proba kata individual, 🥈</li>
103 </ul>
82 104 </aside> </aside>
83 105 </b-col> </b-col>
84 106 </b-row> </b-row>
 
... ... Tot în acest an, Senpai Mihail Preda devine instructor al clubului "Shingitai K
88 110 <b-row> <b-row>
89 111 <b-col md="6"> <b-col md="6">
90 112 <aside class="oBand_text" aria-labelledby="#Section1Title"> <aside class="oBand_text" aria-labelledby="#Section1Title">
91 <h2 id="Section1Title">Shingitai Karate Club - Vulcan</h2>
113 <h2 id="SectionClujTitle">Patras Alexandru</h2>
114 <div><b>Data nasterii: 22.01.2003</b></div>
115 <div><b>grad-7 kyu</b></div>
116 <p>Palmares:</p>
117 <ul>
118 <li>Medalie de bronz-kumite Campionatul National-2017🥈</li>
119 <li>Medalie de bronz-kumite Campionatul National-2018 🥈</li>
120 <li>Medalie de bronz-kumite Campionatul National-2019 🥈</li>
121 </ul>
92 122 </aside> </aside>
93 123 </b-col> </b-col>
94 <div class="oBand_img toRight-lapUp" style="background-image: url('/images/vulcan/vulcan_08.jpg'); background-position: top center;"></div>
124 <div class="oBand_img toRight-lapUp" style="background-image: url('/images/vulcan/vulcan_06.jpg'); background-position: top center;"></div>
95 125 </b-row> </b-row>
96 126 </band> </band>
97
98 127 </main> </main>
99 128 </template> </template>
100 129
File pages/karate.vue changed (mode: 100644) (index bbbe9e0..eedcaea)
1 1 <template> <template>
2 2 <main> <main>
3 3 <liviu-carousel /> <liviu-carousel />
4
4 5 <band theme="Dark"> <band theme="Dark">
5 6 <div style="margin: 0 10%;"> <div style="margin: 0 10%;">
6 7 <b-embed <b-embed
 
38 39 </b-row> </b-row>
39 40 </band> </band>
40 41
42 <band theme="Dark">
43 <div style="margin: 0 10%;">
44 <b-embed
45 width="100%"
46 type="iframe"
47 aspect="16by9"
48 src="https://www.youtube.com/embed/_sKaj8cZlKU?rel=0"
49 allowfullscreen
50 ></b-embed>
51 </div>
52 </band>
53
41 54 </main> </main>
42 55 </template> </template>
43 56
Commit 19a670c79ed4595385998eb121b4c4bd282df8cb - feat(skc): Added Netlify status badge to readme.
Author: bbgmsys
Author date (UTC): 2020-04-09 08:11
Committer name: bbgmsys
Committer date (UTC): 2020-04-09 08:11
Parent(s): 2b040d32f655004d89d430ae15b5a742f06d8a99
Signing key:
Tree: 38af5409aacac23487b503a51a60d397ce952892
File Lines added Lines deleted
README.md 3 2
File README.md changed (mode: 100644) (index 9d13f1e..f9c6cbc)
1 # skc
1 # SKC [![Netlify Status](https://api.netlify.com/api/v1/badges/7d40d9e7-9fe9-4922-a390-061afbd52340/deploy-status)](https://app.netlify.com/sites/clever-sammet-dcc5eb/deploys)
2
3 ### Shingitai Karate Club
2 4
3 > Shingitai Karate Club
4 5
5 6 ## Build Setup ## Build Setup
6 7
Commit 2b040d32f655004d89d430ae15b5a742f06d8a99 - feat(karate,fitness): Embed some videos.
Author: bbgmsys
Author date (UTC): 2020-04-08 22:52
Committer name: bbgmsys
Committer date (UTC): 2020-04-08 22:52
Parent(s): c03107f8d31bdc23368f52c231ca38248705a50a
Signing key:
Tree: f2140b98887af2b3230454d6449ed1b835d873b4
File Lines added Lines deleted
components/carousels/HomeCarousel.vue 0 1
components/layout/header.vue 1 1
pages/fitness-aerobic-tae-bo.vue 9 46
pages/karate.vue 9 21
File components/carousels/HomeCarousel.vue changed (mode: 100644) (index 9a3e034..8c5142f)
13 13 img-height="480" img-height="480"
14 14 style="text-shadow: 1px 1px 2px #333;" style="text-shadow: 1px 1px 2px #333;"
15 15 > >
16 <!-- Slides with custom text -->
17 16 <b-carousel-slide img-src="/images/carousel/online.jpg"> <b-carousel-slide img-src="/images/carousel/online.jpg">
18 17 <h1>Antrenamente online</h1> <h1>Antrenamente online</h1>
19 18 <p>În această perioadă folosim și noi tehnologia pentru a face antrenamente online</p> <p>În această perioadă folosim și noi tehnologia pentru a face antrenamente online</p>
File components/layout/header.vue changed (mode: 100644) (index bac43a6..2fbb7eb)
23 23 <nuxt-link to="/campioni" no-prefetch> <nuxt-link to="/campioni" no-prefetch>
24 24 Campioni Campioni
25 25 </nuxt-link> </nuxt-link>
26 <nuxt-link to="/locatii" no-prefetch>
26 <nuxt-link to="/media" no-prefetch>
27 27 Media Media
28 28 </nuxt-link> </nuxt-link>
29 29 </aside> </aside>
File pages/fitness-aerobic-tae-bo.vue changed (mode: 100644) (index f27dfd7..f1f141e)
2 2 <main> <main>
3 3 <liviu-carousel /> <liviu-carousel />
4 4 <band theme="Dark"> <band theme="Dark">
5 <b-row>
6 <b-col md="6">
7 <aside class="oBand_text" aria-labelledby="#Section1Title">
8 <h2 id="Section1Title">Antrenorul emerit al sportului <br/> Sensei Liviu Tăbăcaru</h2>
9 <p><strong>Shingitai Karate Club</strong>, a luat naștere la
10 Brașov, în luna februarie 1992, avându-l drept
11 fondator pe <a href="/antrenor-emerit-al-sportului-liviu-tabacaru"><strong>antrenorul emerit al sportului Sensei Liviu Tăbăcaru</strong></a>. Printre primele
12 cluburi private de arte marțiale întemeiate în
13 Brașov după 1990, <strong>Shingitai</strong> este afiliat la
14 <strong>Federația Română de Arte Marțiale (FRAM)</strong> și
15 <strong>New International Karate Organization (NIKO)</strong> –
16 for cu sediul la <strong>Matsuyama (Japonia)</strong> și prezidat
17 de <strong>Kancho Hidenori Ashihara</strong>. În limba japoneză,
18 "shin" înseamnă spirit, "gi" se traduce printr-o bună
19 pregătire fizică și tehnică, iar "tai", prin corp. Într-o
20 traducere liberă, <strong>Shingitai</strong> înseamnă <strong>"luptător
21 complet"</strong>.</p>
22 </aside>
23 </b-col>
24 <div class="oBand_img toRight-lapUp" style="background-image: url('/images/liviu/LiviuTabacaru_02.jpg'); background-position: top center;"></div>
25 </b-row>
26 </band>
27
28 <band theme="Light">
29 <b-row>
30 <div class="oBand_img toLeft-lapUp" style="background-image: url('/images/liviu/LiviuTabacaru_03.jpg')"></div>
31 <b-col md="6"></b-col>
32 <b-col md="6">
33 <aside class="oBand_text">
34 <h2 id="Section1Title">Antrenorul emerit al sportului <br/> Sensei Liviu Tăbăcaru</h2>
35 <p><strong>Shingitai Karate Club</strong>, a luat naștere la
36 Brașov, în luna februarie 1992, avându-l drept
37 fondator pe <strong>antrenorul emerit al sportului Sensei Liviu Tăbăcaru</strong>. Printre primele
38 cluburi private de arte marțiale întemeiate în
39 Brașov după 1990, <strong>Shingitai</strong> este afiliat la
40 <strong>Federația Română de Arte Marțiale (FRAM)</strong> și
41 <strong>New International Karate Organization (NIKO)</strong> –
42 for cu sediul la <strong>Matsuyama (Japonia)</strong> și prezidat
43 de <strong>Kancho Hidenori Ashihara</strong>. În limba japoneză,
44 "shin" înseamnă spirit, "gi" se traduce printr-o bună
45 pregătire fizică și tehnică, iar "tai", prin corp. Într-o
46 traducere liberă, <strong>Shingitai</strong> înseamnă <strong>"luptător
47 complet"</strong>.</p>
48 </aside>
49 </b-col>
50 </b-row>
5 <div style="margin: 0 10%;">
6 <b-embed
7 width="100%"
8 type="iframe"
9 aspect="16by9"
10 src="https://www.youtube.com/embed/3OWMdPJeclM?rel=0"
11 allowfullscreen
12 ></b-embed>
13 </div>
51 14 </band> </band>
52 15
53 16 </main> </main>
File pages/karate.vue changed (mode: 100644) (index 6c24948..bbbe9e0)
2 2 <main> <main>
3 3 <liviu-carousel /> <liviu-carousel />
4 4 <band theme="Dark"> <band theme="Dark">
5 <b-row>
6 <b-col md="6">
7 <aside class="oBand_text" aria-labelledby="#Section1Title">
8 <h2 id="Section1Title">Antrenorul emerit al sportului <br/> Sensei Liviu Tăbăcaru</h2>
9 <p><strong>Shingitai Karate Club</strong>, a luat naștere la
10 Brașov, în luna februarie 1992, avându-l drept
11 fondator pe <a href="/antrenor-emerit-al-sportului-liviu-tabacaru"><strong>antrenorul emerit al sportului Sensei Liviu Tăbăcaru</strong></a>. Printre primele
12 cluburi private de arte marțiale întemeiate în
13 Brașov după 1990, <strong>Shingitai</strong> este afiliat la
14 <strong>Federația Română de Arte Marțiale (FRAM)</strong> și
15 <strong>New International Karate Organization (NIKO)</strong> –
16 for cu sediul la <strong>Matsuyama (Japonia)</strong> și prezidat
17 de <strong>Kancho Hidenori Ashihara</strong>. În limba japoneză,
18 "shin" înseamnă spirit, "gi" se traduce printr-o bună
19 pregătire fizică și tehnică, iar "tai", prin corp. Într-o
20 traducere liberă, <strong>Shingitai</strong> înseamnă <strong>"luptător
21 complet"</strong>.</p>
22 </aside>
23 </b-col>
24 <div class="oBand_img toRight-lapUp" style="background-image: url('/images/liviu/LiviuTabacaru_02.jpg'); background-position: top center;"></div>
25 </b-row>
5 <div style="margin: 0 10%;">
6 <b-embed
7 width="100%"
8 type="iframe"
9 aspect="16by9"
10 src="https://www.youtube.com/embed/mMYeT-kM6qk?rel=0"
11 allowfullscreen
12 ></b-embed>
13 </div>
26 14 </band> </band>
27 15
28 16 <band theme="Light"> <band theme="Light">
Hints:
How to merge on your machine?
git fetch origin refs/mr/1:mr-1
git checkout main
git merge mr-1

To "see" all the merge requests as branches,
add, in the config file (.git/config), under the remote you want, a line like this:
fetch = +refs/mr/*:refs/remotes/your_remote_name_for_example_origin/mr/*
After you run a git fetch, you will have all the pull requests locally.
For example, you can merge one of them:
git checkout main
git merge mr/1