xit-app
/
adds-fo
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
dev
kjh 6 months ago
parent 698fdf748b 1ea51b700c
commit b925e2b528
4 changed files with 45 additions and 38 deletions
Show Stats Download Patch File Download Diff File

9
src/main/webapp/WEB-INF/jsp/include/top.jsp
Unescape Escape View File

@ -3,7 +3,14 @@
<%-- Navbar --%> <%-- Navbar --%>
<nav id="layout-navbar" class="layout-navbar navbar navbar-expand-xl bg-navbar-theme bg-primary justify-content-between"> <nav id="layout-navbar" class="layout-navbar navbar navbar-expand-xl bg-navbar-theme bg-primary justify-content-between">
<div class="navbar-nav"> <div class="navbar-nav">
<a onclick="wctx.home();" style="font-weight: bold; font-size: 1.2rem;"><b>${appName}</b></a> <a onclick="wctx.home();" style="font-weight: bold; font-size: 1.2rem;">
<img
src="<c:url value="/resources/img/design/logo.png"/>"
class="img-fluid w-5"
style="width:6%;"
alt="Login image"
/>
</a>
</div> </div>
<div class="navbar-nav navbar-dropdown dropdown-user dropdown"> <div class="navbar-nav navbar-dropdown dropdown-user dropdown">
<div class="avatar d-flex flex-row" data-bs-toggle="dropdown"> <div class="avatar d-flex flex-row" data-bs-toggle="dropdown">

74
src/main/webapp/WEB-INF/jsp/login.jsp
Unescape Escape View File

@ -1,56 +1,53 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isELIgnored="false" session="false"%> <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isELIgnored="false" session="false"%>
<%@ include file="/WEB-INF/jsp/include/taglib.jsp"%> <%@ include file="/WEB-INF/jsp/include/taglib.jsp"%>
<jsp:include page="/WEB-INF/jsp/include/head.jsp" /> <jsp:include page="/WEB-INF/jsp/include/head.jsp" />
<body> <body>
<!-- Content --> <!-- Content -->
<div class="authentication-wrapper authentication-cover d-flex justify-content-center align-items-center h-px-800">
<div class="authentication-wrapper authentication-cover"> <div class="d-flex col-lg-5 col-xl-6 shadow" style="border: 0px solid red; background-color: #fff;">
<div class="authentication-inner row m-0"> <!-- /Left Text -->
<!-- /Left Text --> <div class="" style="">
<div class="d-none d-lg-flex col-lg-7 col-xl-8 align-items-center p-5"> <img
<div class="w-100 d-flex justify-content-center"> src="<c:url value="/resources/img/design/login_B.png"/>"
<img class="img-fluid"
src="<c:url value="/resources/img/illustrations/boy-with-rocket-light.png"/>" alt="Login image"
class="img-fluid" style="height: 630px !important;"
alt="Login image" data-app-dark-img="illustrations/boy-with-rocket-dark.png"
width="700" data-app-light-img="illustrations/boy-with-rocket-light.png"
data-app-dark-img="illustrations/boy-with-rocket-dark.png" />
data-app-light-img="illustrations/boy-with-rocket-light.png"
/>
</div>
</div> </div>
<!-- /Left Text --> <!-- /Left Text -->
<!-- Login --> <!-- Login -->
<div class="d-flex col-12 col-lg-5 col-xl-4 align-items-center authentication-bg p-sm-5 p-4" style="background-color:white;"> <div class="d-flex col-12 col-lg-5 col-xl-6 align-items-center mx-2 px-3 h-px-600" style="letter-spacing: -0.6px;">
<div class="w-px-400 mx-auto"> <div class="w-px-400 mx-auto">
<!-- Logo --> <!-- Logo -->
<div class="app-brand mb-5"> <%-- <div class="app-brand mb-5">
<a href="index.html" class="app-brand-link gap-2"> <a href="index.html" class="app-brand-link gap-2">
<span class="app-brand-logo demo"> <span class="app-brand-logo demo">
<svg <svg
width="25" width="25"
viewBox="0 0 25 42" viewBox="0 0 25 42"
version="1.1" version="1.1"
xmlns="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xlink="http://www.w3.org/1999/xlink"
> >
<defs> <defs>
<path <path
d="M13.7918663,0.358365126 L3.39788168,7.44174259 C0.566865006,9.69408886 -0.379795268,12.4788597 0.557900856,15.7960551 C0.68998853,16.2305145 1.09562888,17.7872135 3.12357076,19.2293357 C3.8146334,19.7207684 5.32369333,20.3834223 7.65075054,21.2172976 L7.59773219,21.2525164 L2.63468769,24.5493413 C0.445452254,26.3002124 0.0884951797,28.5083815 1.56381646,31.1738486 C2.83770406,32.8170431 5.20850219,33.2640127 7.09180128,32.5391577 C8.347334,32.0559211 11.4559176,30.0011079 16.4175519,26.3747182 C18.0338572,24.4997857 18.6973423,22.4544883 18.4080071,20.2388261 C17.963753,17.5346866 16.1776345,15.5799961 13.0496516,14.3747546 L10.9194936,13.4715819 L18.6192054,7.984237 L13.7918663,0.358365126 Z" d="M13.7918663,0.358365126 L3.39788168,7.44174259 C0.566865006,9.69408886 -0.379795268,12.4788597 0.557900856,15.7960551 C0.68998853,16.2305145 1.09562888,17.7872135 3.12357076,19.2293357 C3.8146334,19.7207684 5.32369333,20.3834223 7.65075054,21.2172976 L7.59773219,21.2525164 L2.63468769,24.5493413 C0.445452254,26.3002124 0.0884951797,28.5083815 1.56381646,31.1738486 C2.83770406,32.8170431 5.20850219,33.2640127 7.09180128,32.5391577 C8.347334,32.0559211 11.4559176,30.0011079 16.4175519,26.3747182 C18.0338572,24.4997857 18.6973423,22.4544883 18.4080071,20.2388261 C17.963753,17.5346866 16.1776345,15.5799961 13.0496516,14.3747546 L10.9194936,13.4715819 L18.6192054,7.984237 L13.7918663,0.358365126 Z"
id="path-1" id="path-1"
></path> ></path>
<path <path
d="M5.47320593,6.00457225 C4.05321814,8.216144 4.36334763,10.0722806 6.40359441,11.5729822 C8.61520715,12.571656 10.0999176,13.2171421 10.8577257,13.5094407 L15.5088241,14.433041 L18.6192054,7.984237 C15.5364148,3.11535317 13.9273018,0.573395879 13.7918663,0.358365126 C13.5790555,0.511491653 10.8061687,2.3935607 5.47320593,6.00457225 Z" d="M5.47320593,6.00457225 C4.05321814,8.216144 4.36334763,10.0722806 6.40359441,11.5729822 C8.61520715,12.571656 10.0999176,13.2171421 10.8577257,13.5094407 L15.5088241,14.433041 L18.6192054,7.984237 C15.5364148,3.11535317 13.9273018,0.573395879 13.7918663,0.358365126 C13.5790555,0.511491653 10.8061687,2.3935607 5.47320593,6.00457225 Z"
id="path-3" id="path-3"
></path> ></path>
<path <path
d="M7.50063644,21.2294429 L12.3234468,23.3159332 C14.1688022,24.7579751 14.397098,26.4880487 13.008334,28.506154 C11.6195701,30.5242593 10.3099883,31.790241 9.07958868,32.3040991 C5.78142938,33.4346997 4.13234973,34 4.13234973,34 C4.13234973,34 2.75489982,33.0538207 2.37032616e-14,31.1614621 C-0.55822714,27.8186216 -0.55822714,26.0572515 -4.05231404e-15,25.8773518 C0.83734071,25.6075023 2.77988457,22.8248993 3.3049379,22.52991 C3.65497346,22.3332504 5.05353963,21.8997614 7.50063644,21.2294429 Z" d="M7.50063644,21.2294429 L12.3234468,23.3159332 C14.1688022,24.7579751 14.397098,26.4880487 13.008334,28.506154 C11.6195701,30.5242593 10.3099883,31.790241 9.07958868,32.3040991 C5.78142938,33.4346997 4.13234973,34 4.13234973,34 C4.13234973,34 2.75489982,33.0538207 2.37032616e-14,31.1614621 C-0.55822714,27.8186216 -0.55822714,26.0572515 -4.05231404e-15,25.8773518 C0.83734071,25.6075023 2.77988457,22.8248993 3.3049379,22.52991 C3.65497346,22.3332504 5.05353963,21.8997614 7.50063644,21.2294429 Z"
id="path-4" id="path-4"
></path> ></path>
<path <path
d="M20.6,7.13333333 L25.6,13.8 C26.2627417,14.6836556 26.0836556,15.9372583 25.2,16.6 C24.8538077,16.8596443 24.4327404,17 24,17 L14,17 C12.8954305,17 12,16.1045695 12,15 C12,14.5672596 12.1403557,14.1461923 12.4,13.8 L17.4,7.13333333 C18.0627417,6.24967773 19.3163444,6.07059163 20.2,6.73333333 C20.3516113,6.84704183 20.4862915,6.981722 20.6,7.13333333 Z" d="M20.6,7.13333333 L25.6,13.8 C26.2627417,14.6836556 26.0836556,15.9372583 25.2,16.6 C24.8538077,16.8596443 24.4327404,17 24,17 L14,17 C12.8954305,17 12,16.1045695 12,15 C12,14.5672596 12.1403557,14.1461923 12.4,13.8 L17.4,7.13333333 C18.0627417,6.24967773 19.3163444,6.07059163 20.2,6.73333333 C20.3516113,6.84704183 20.4862915,6.981722 20.6,7.13333333 Z"
id="path-5" id="path-5"
></path> ></path>
</defs> </defs>
<g id="g-app-brand" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> <g id="g-app-brand" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
@ -71,8 +68,8 @@
</g> </g>
</g> </g>
<g <g
id="Triangle" id="Triangle"
transform="translate(19.000000, 11.000000) rotate(-300.000000) translate(-19.000000, -11.000000) " transform="translate(19.000000, 11.000000) rotate(-300.000000) translate(-19.000000, -11.000000) "
> >
<use fill="#696cff" xlink:href="#path-5"></use> <use fill="#696cff" xlink:href="#path-5"></use>
<use fill-opacity="0.2" fill="#FFFFFF" xlink:href="#path-5"></use> <use fill-opacity="0.2" fill="#FFFFFF" xlink:href="#path-5"></use>
@ -84,10 +81,10 @@
</span> </span>
<span class="app-brand-text demo text-body fw-bolder">XIT Base Example</span> <span class="app-brand-text demo text-body fw-bolder">XIT Base Example</span>
</a> </a>
</div> </div>--%>
<!-- /Logo --> <!-- /Logo -->
<h4 class="mb-2">반갑습니다, XIT Base입니다. 👋</h4> <%-- <h4 class="mb-2">반갑습니다, XIT Base입니다. 👋</h4>
<p class="mb-4">이 사이트는 XIT Base로 만든 예제 사이트 입니다.</p> <p class="mb-4">이 사이트는 XIT Base로 만든 예제 사이트 입니다.</p>--%>
<div id="formAuthentication" class="mb-3"> <div id="formAuthentication" class="mb-3">
<div class="mb-3"> <div class="mb-3">
@ -107,12 +104,15 @@
</div> </div>
</div> </div>
<button class="btn btn-primary d-grid w-100" onclick="login();">로그인</button> <button class="btn btn-primary d-grid w-100" style="letter-spacing: -0.6px;" onclick="login();">로그인</button>
</div> </div>
</div> </div>
</div> </div>
<!-- /Login --> <!-- /Login -->
</div>
</div> </div>
</div> </div>

BIN
src/main/webapp/resources/img/design/login_B.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 965 KiB

BIN
src/main/webapp/resources/img/design/logo.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 52 KiB

Write Preview
Loading…
Cancel
Save